//
//  ViewController.m
//  DIYSlider
//
//  Created by Hello Cai on 17/2/20.
//  Copyright © 2017年 Hello Cai. All rights reserved.
//

#import "ViewController.h"

@interface ViewController ()

@end

@implementation ViewController

- (void)viewDidLoad {
    [super viewDidLoad];
    // Do any additional setup after loading the view, typically from a nib.
    
    //我是cai，这次认真理清思绪
    
    //我是hong，我修复完了冲突直接提交，忘记了，现在更改内容
    
    [self fromHong];
    
    //修改一下内容
    [self change];
    
    //添加啦啦啦啦
}

-(void)change{
    
}

-(void)fromHong{
    NSLog(@"这个方法提供给hong");
    
    //我是hong
    self.view.backgroundColor = [UIColor redColor];
    //我是hong
    //我是hong
    //我是hong
    
    //我是hong
}

-(void)jixuaddHOng{
    
}

- (void)didReceiveMemoryWarning {
    [super didReceiveMemoryWarning];
    // Dispose of any resources that can be recreated.
}


@end
